Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 01:52:03 +0000 (17:52 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Wed, 2 Mar 2011 01:52:03 +0000 (17:52 -0800)
commit45e4dea8f312b82b6ee2b6b850f1d71d3c217f54
treed474ecabea69e20610c193d6bf781a9999a0a32e
parent38fd0442fe500bdab6f677878bb4e0be58f475a7
parentafdb715c53b4d4bb70d15a3a36520892d11e3a78
Merge from mainline.
ChangeLog
src/ChangeLog